From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Thu, 28 Nov 2019 22:47:58 +0000 (-0300)
Subject: unlockDialog: Don't destroy on cancel
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~777^2^2~131
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1b84a3ecb20c0551291da3aa65ad2dbd33dc4691;p=gnome-shell.git

unlockDialog: Don't destroy on cancel

Otherwise there will be no way to recover it in the future. Also
remove an else condition that assumed the dialog would destroy
itself on cancel.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 918df0543..3d66a2737 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -191,8 +191,6 @@ var ScreenShield = class {
             // on its own, so ensure it stays on lock screen
             // instead
             this._lockScreenGroup.grab_key_focus();
-        } else {
-            this._dialog = null;
         }
     }
 
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index ff2787ac4..7b9b0e723 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -499,8 +499,6 @@ var UnlockDialog = GObject.registerClass({
 
     cancel() {
         this._authPrompt.cancel();
-
-        this.destroy();
     }
 
     addCharacter(unichar) {